From 8bfe74175c29aa5ba77dbca0b62df3f4ed548e16 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 5 Aug 2005 09:53:04 +0000 Subject: [PATCH] No need to define errno defined at the top of reboot.c. err2 is only needed when CONFIG_MAGIC_SYSRQ is defined. Signed-off-by: Li Xin --- linux-2.6-xen-sparse/arch/xen/kernel/reboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c index 9447000690..ecb547302e 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c @@ -1,7 +1,4 @@ - #define __KERNEL_SYSCALLS__ -static int errno; -#include #include #include #include @@ -309,7 +306,10 @@ static int setup_shutdown_watcher(struct notifier_block *notifier, unsigned long event, void *data) { - int err1=0, err2=0; + int err1 = 0; +#ifdef CONFIG_MAGIC_SYSRQ + int err2 = 0; +#endif down(&xenbus_lock); err1 = register_xenbus_watch(&shutdown_watch); -- 2.30.2